Autogenerated HTML docs for v2.27.0-343-g4a0fcf
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index f6a4d31..7c72ade 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html
@@ -747,8 +747,8 @@ > where Junio C Hamano <junkio@cox.net> told me that... >> Linus Torvalds <torvalds@osdl.org> writes: >> ->> > Junio, maybe you want to talk about how you move patches from your "pu" ->> > branch to the real branches. +>> > Junio, maybe you want to talk about how you move patches from your +>> > "seen" branch to the real branches. >> > Actually, wouldn't this be also precisely for what StGIT is intended to?</code></pre> </div></div> @@ -757,13 +757,13 @@ the kind of task StGIT is designed to do.</p></div> <div class="paragraph"><p>I just have done a simpler one, this time using only the core Git tools.</p></div> -<div class="paragraph"><p>I had a handful of commits that were ahead of master in pu, and I +<div class="paragraph"><p>I had a handful of commits that were ahead of master in <em>seen</em>, and I wanted to add some documentation bypassing my usual habit of -placing new things in pu first. At the beginning, the commit +placing new things in <em>seen</em> first. At the beginning, the commit ancestry graph looked like this:</p></div> <div class="literalblock"> <div class="content"> -<pre><code> *"pu" head +<pre><code> *"seen" head master --> #1 --> #2 --> #3</code></pre> </div></div> <div class="paragraph"><p>So I started from master, made a bunch of edits, and committed:</p></div> @@ -777,39 +777,39 @@ <div class="paragraph"><p>After the commit, the ancestry graph would look like this:</p></div> <div class="literalblock"> <div class="content"> -<pre><code> *"pu" head +<pre><code> *"seen" head master^ --> #1 --> #2 --> #3 \ \---> master</code></pre> </div></div> <div class="paragraph"><p>The old master is now master^ (the first parent of the master). The new master commit holds my documentation updates.</p></div> -<div class="paragraph"><p>Now I have to deal with "pu" branch.</p></div> +<div class="paragraph"><p>Now I have to deal with "seen" branch.</p></div> <div class="paragraph"><p>This is the kind of situation I used to have all the time when Linus was the maintainer and I was a contributor, when you look -at "master" branch being the "maintainer" branch, and "pu" +at "master" branch being the "maintainer" branch, and "seen" branch being the "contributor" branch. Your work started at the tip of the "maintainer" branch some time ago, you made a lot of progress in the meantime, and now the maintainer branch has some other commits you do not have yet. And "git rebase" was written with the explicit purpose of helping to maintain branches like -"pu". You <em>could</em> merge master to pu and keep going, but if you +"seen". You <em>could</em> merge master to <em>seen</em> and keep going, but if you eventually want to cherrypick and merge some but not necessarily all changes back to the master branch, it often makes later operations for <em>you</em> easier if you rebase (i.e. carry forward -your changes) "pu" rather than merge. So I ran "git rebase":</p></div> +your changes) "seen" rather than merge. So I ran "git rebase":</p></div> <div class="literalblock"> <div class="content"> -<pre><code>$ git checkout pu -$ git rebase master pu</code></pre> +<pre><code>$ git checkout seen +$ git rebase master seen</code></pre> </div></div> <div class="paragraph"><p>What this does is to pick all the commits since the current -branch (note that I now am on "pu" branch) forked from the +branch (note that I now am on "seen" branch) forked from the master branch, and forward port these changes.</p></div> <div class="literalblock"> <div class="content"> <pre><code>master^ --> #1 --> #2 --> #3 - \ *"pu" head + \ *"seen" head \---> master --> #1' --> #2' --> #3'</code></pre> </div></div> <div class="paragraph"><p>The diff between master^ and #1 is applied to master and @@ -818,7 +818,7 @@ commits are made similarly out of #2 and #3 commits.</p></div> <div class="paragraph"><p>Old #3 is not recorded in any of the .git/refs/heads/ file anymore, so after doing this you will have dangling commit if -you ran fsck-cache, which is normal. After testing "pu", you +you ran fsck-cache, which is normal. After testing "seen", you can run "git prune" to get rid of those original three commits.</p></div> <div class="paragraph"><p>While I am talking about "git rebase", I should talk about how to do cherrypicking using only the core Git tools.</p></div> @@ -895,7 +895,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2020-06-29 16:26:34 PDT + 2020-07-06 22:34:11 PDT </div> </div> </body>
